From 16623d4e7121842e03194c25474abc9ce70626a7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 24 May 2021 17:37:55 -0400
Subject: [PATCH] quartz: Elide underscores again

We don't want a literal _File to show up in the
global menubar on OS X, so use the revivied
_gtk_elide_underscores.

Related: #3967
---
 gtk/gtkapplication-quartz-menu.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkapplication-quartz-menu.c b/gtk/gtkapplication-quartz-menu.c
index b9d27bd19f..4896fdc6bf 100644
--- a/gtk/gtkapplication-quartz-menu.c
+++ b/gtk/gtkapplication-quartz-menu.c
@@ -24,6 +24,7 @@
 #include "gtkmenutrackerprivate.h"
 #include "gtkicontheme.h"
 #include "gtkquartz.h"
+#include "gtkprivate.h"
 
 #include <gdk/macos/gdkmacos.h>
 #include <gdk/macos/gdkmacoskeymap-private.h>
@@ -231,7 +232,7 @@ icon_loaded (GObject      *object,
 
 - (void)didChangeLabel
 {
-  const char *label = gtk_menu_tracker_item_get_label (trackerItem);
+  char *label = _gtk_elide_underscores (gtk_menu_tracker_item_get_label (trackerItem));
 
   NSString *title = [NSString stringWithUTF8String:label ? : ""];
 
@@ -256,6 +257,8 @@ icon_loaded (GObject      *object,
     }
 
   [self setTitle:title];
+
+  g_free (label);
 }
 
 - (void)didChangeIcon
-- 
2.30.2